tree 9970641ff9829c08f71ced9898311a7dfa87c42c
parent a487e1e8dfef7117884f89df468bdf211a231a7d
parent d3de5a8c12c2c75110dc032feee8bcea2413d54d
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682445764 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1682445764 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22794565'] into tm-qpr3-c-release.

Change-Id: Ic34947b8b28a34414c358b7356863f043d09f420