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

Change-Id: I2afadd01a0056abd5b7256ee984c2be0f099f843