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

Change-Id: I0148c30c259516cd81bb106ddb3fea8e415369bb