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

Change-Id: I7d50b0507731aa52f3593fe3fba362a630ef63c6