tree 4500c02f9e5bc4454590a9bceed7c47430a61dbe
parent 50aa8d81dd9944889157ec0db65020df82f5d5de
parent 32aada6f9fdfba17b2571671e0a593806d5916d4
author android-build-team Robot <android-build-team-robot@google.com> 1604462591 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1604462591 +0000

Merge cherrypicks of [12982162, 12984235, 12984148, 12984149] into rvc-qpr1-release

Change-Id: Idd5e332200277408c505e08f5b9ec6932f32b9b7