tree 199e7920ac5b47bf10e27a730cdce209dff8cb18
parent b0bbc8ea6f860ff6773860449d03e66a020a1b0f
parent 64bac61e49f9c64f19a51e8416d271441a557a60
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1665109130 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1665109130 +0000

Merge cherrypicks of [19449016, 19745058] into security-aosp-qt-release.

Change-Id: I7d50b0507731aa52f3593fe3fba362a630ef63c6