tree 32ea8afca7d00238f0fa1f7e153238d0d3fe8925
parent 9c6a104cfeb943e7bf8124ca21cfa4eaefb11160
parent 841946be56adc4efb5f3ffa59ecd720a2f1de83a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1668477152 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1668477152 +0000

Merge cherrypicks of [20026125, 20112204] into tm-qpr1-release.

Change-Id: I7c2411ecb8c2f065f15b8a4d3bf794897b77652c