[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 2b151947b0 -s ours
am: 40993dd0dc

Change-Id: I240e9f827dcfd795c5482c5741e9f466d66be654