tree 1b564d006fb63fc190b4c32e7f5f7244736054f1
parent 065ec3ff355fbbe66823b04fb8eb9ccdc5967070
parent afe80453837e68dd07b42130ff39dc71dcf1ad6a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123584 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1639123584 +0000

Merge cherrypicks of [15718931, 15718932, 16248754] into security-aosp-qt-release.

Change-Id: Ib47517043d7801513c9662bad04aff415a7b76ed