[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 38ed224625 -s ours
am: fcc92b6fc1

Change-Id: Ib275ab42c94c3399739f787930ee4d03581235a0