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

Change-Id: I9418ade812caa84e1daf6d8ccb2b0a8bc4cc224c