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

Change-Id: Icc1aec56d4cadb4ea6a5a9bc495f1cff9f56f046