tree 15c77f3a5a9a526a4a01facf2e994b779ff26965
parent 328b2e27d216261d40775e7066a04470bd499e1c
parent 7880c988ea40d2e63be5059df8df7dc4c8a6d22e
author android-build-team Robot <android-build-team-robot@google.com> 1582925193 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1582925193 +0000

Merge cherrypicks of [10460465, 10460521, 10460352, 10458819] into qt-qpr2-release

Change-Id: I9a02cca7de11383edc3910c29bc414ce1152971c