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

Change-Id: I4eb80c36aba1abbe3fe3044c2c3716a49f4a3793