Merge cherrypicks of [19504916] into security-aosp-qt-release. Change-Id: I23a2d787b828f039aea2ea3610b8d50f139aee17