Merge cherrypicks of ['ag/20545969'] into security-aosp-sc-release.

Change-Id: I6885cdec159d1b0377af2ffa0eef15e914a638ec