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

Change-Id: I5c27bbf6ced11ec7a30e55bf3c79256a15100fb3