Android security 9.0.0 release 76
Merge cherrypicks of [16101569, 16145004] into security-aosp-pi-release.

Change-Id: I2bf0886e13b83f935560e3c593730b97c9bb825c