tree bbab4c60939b92a05ff01a5ba2b3f3765d3eea3d
parent b7e3d9579894fc134bea1ab62428990339fa0ca2
parent 350352bcb7483f42f50ff439952ed02f5a79a509
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649460550 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1649460550 +0000

Merge cherrypicks of [17585758] into security-aosp-qt-release.

Change-Id: I60ffa81746e98da9b906686adf6c6761d214a774