Merge cherrypicks of ['ag/20545926'] into security-aosp-rvc-release. Change-Id: I9b01ee4a482be1b394d19677aea5d0731712a6f8