Merge cherrypicks of ['ag/20259323'] into security-aosp-tm-release.

Change-Id: Id84a596df26d8a454e234670b1af315f7d445cab