Android Security 9.0.0 Release 69 (7269718)
Merge cherrypicks of [14132525, 14131687] into security-aosp-pi-release

Change-Id: I5f2224e5ad09bf454950b5fb823600b97edd8afa