Merge cherrypicks of [14132475, 14132476] into security-aosp-qt-release

Change-Id: Idc2e3c0ac8add5be34332d7680d7bfef045a2d50