[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: a559c4d21a -s ours am: 07e8cd03d8
am: d2734bab1e

Change-Id: Ic461e96a476b98d084c2cba462ee72eb04b09306