Merge cherrypicks of [20035120] into security-aosp-tm-release. Change-Id: Ifb8f54b9fd16c06d24c3d8a821a0c8bd4b06a687