[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: c21a695600 -s ours
am: 74666c8dc0

Change-Id: Ibf5839c0744239af47e11cc5a4978e3569865ac6