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

Change-Id: Iaa312385b5ad1de23b61ced7637290e0c10379e9