tree bfe4653281cda714b7f5f9d9e3d1c158860a7c14
parent 408e00c407784b0edba484d8b3ad77aeb6090cff
parent bb2eb8cc3206a37d5d36e09aaec648675fe77249
author android-build-team Robot <android-build-team-robot@google.com> 1595377330 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1595377330 +0000

Merge cherrypicks of [12204290, 12204195, 12205772, 12205773, 12205663] into rvc-release

Change-Id: I96f4acd2bc4ae6cccf9bdb93f9c84d34b24603da