Merge cherrypicks of [20404654, 20406270, 20406865, 20414805] into security-aosp-sc-release.

Change-Id: I32f86a89b1070eb874c67a0917b653c50a6fe358