Merge cherrypicks of [20074815] into security-aosp-tm-release.

Change-Id: Ifd9404b3a18aec10ae164d289baa55294e56c631