tree 56cb73a9204bdf3bd3019b7d5d0eb43ea89f6ce6
parent 2ea16ffc94dde200c2ab84c83210b82b1a953860
parent bdcd0cec60e1d56da76816d5b8717d8b68fdaf2e
author android-build-team Robot <android-build-team-robot@google.com> 1573854229 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1573854229 +0000

Merge cherrypicks of [9739231, 9739679, 9739582, 9739066] into qt-qpr1-b-release

Change-Id: Id70cb6a90b3aad2e0da0fef979bff291d96d8d3f