tree a80f8ea16e7aba50cc0b3188c61365d4917e426a
parent b430504d8e56855c75b5768da1224c755f06f503
parent 476d1d25c802db238bd2a11afe277cd7f26dda7f
author android-build-team Robot <android-build-team-robot@google.com> 1574713247 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1574713247 +0000

Merge cherrypicks of [9802047, 9802131, 9802048, 9802634] into qt-qpr1-release

Change-Id: I5ad8695c17d140463283ea4f2102f3fa169e8660