[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 1fc150fa6e -s ours am: 42cc98ef4d
am: c0a55b848c

Change-Id: I874947a1764f932a982b3821fd8ef7121a82d8c5