[automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: 105542679f -s ours
am skip reason: subject contains skip directive

Change-Id: I04b43539e52eae8fd96dc98f36a202c3584d29f4