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

Change-Id: Iad9d9f4a758a0fc77874ecd42c6e99dcabb902c6