tree 628c147ab93b992d7265e46db5e6fdffeffff328
parent 2af20c4b262bdc46ffb6afe60184319b41829e5e
parent f0ed21294499ab2dc754ad9784fdeb9aeafd4523
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689786521 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1689786521 +0000

Merge cherrypicks of ['android-review.googlesource.com/2135096', 'android-review.googlesource.com/2135097'] into sparse-10316531-L68800000962056696.
SPARSE_CHANGE: I57132a55a089c7aae3e17c717ecd9dc1047fede8
SPARSE_CHANGE: I4afb443b7e527038fb42424543bb1538b01d5ec9

Change-Id: Ibe1c289e1b4d3af39fa2423139f134632032c37c