tree e2549b5ebeeacb8691aeac9f2a8a94ecceda10c4
parent 19c8495a0f91785c5ec22f29bdb3b80237739f60
parent 9e1c6732ae9eb7ec2eede6a4b0a0c7574603faa3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1727861887 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1727861887 +0000

Merge cherrypicks of ['partner-android-review.googlesource.com/2939861', 'partner-android-review.googlesource.com/2947570'] into sparse-12362889-L89400030006799064.
SPARSE_CHANGE: I698e0cc56d8e003f520df39743f52459af898fbf
SPARSE_CHANGE: I8246b1f4598777832d22da398a6ff822a9cc506e


Change-Id: I525c4453d314883554c35ee2db1304e28102f789
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>