[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: c12771af1e -s ours am: 80fcaa0568
am: 6304bb21f2

Change-Id: Ieaa8a2e19d261603c2c529201d4336784b694e13