Merge cherrypicks of [20024810] into security-aosp-sc-release.

Change-Id: Ic941fc34c2f6d8a7183191b3fc457b3f40b07b75