tree 9f26f67acb39d731cec6ab8acca759b1d4d92ff3
parent d3a6849126e3637885ec4c4469a0318ec7befbe7
parent 61f357128df50305c1341fb01b0e733e14632ebc
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654965435 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1654965435 +0000

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

Change-Id: I5d7eb5c41f8ad5b9d424a7534e2e91f6430b49ff