Merge cherrypicks of [18321297] into security-aosp-sc-v2-release. Change-Id: Ie7296f601da6af16529c7d81027d3caa2e400c38