tree 2e39ea75f2a65e0225abdf781350bcef4db6acae
parent 421b8f59223a8a3cdacd4c0ec27251fc82abda54
parent 812c0dc3d1c8290435f070be047631b37012e86a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1677814126 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1677814126 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/21732136'] into tm-d2-release.

Change-Id: I1a7f688fabc005ba48f4e9739ab400fef55b40e1