tree 1f61091af569a79d022c41c24c21d0e70a4fce3f
parent 52cc2af533bd19e4891aba26e429f7a99f5afee3
parent 90c5ddb5095c98e3fd23353441b55ba945e12378
author android-build-team Robot <android-build-team-robot@google.com> 1588569936 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1588569936 +0000

Merge cherrypicks of [11361055, 11362850, 11362385, 11362386, 11362870] into qt-d4-release

Change-Id: If05fcacca0e9aa7f70546a317ca332bf4c92b2dc