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

Change-Id: I4eccb826d71e1a5a9adaa38260ed84ec3516f106