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

Change-Id: I769883422923f5e067b525a0b1cfaeecef2b8f1c