[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 96a060980c -s ours am: bf354642f9
am: 79975d63c5

Change-Id: I527bad729ce66f7f0331e06e7430772434d330a3