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

Change-Id: If42bd0e08c24388165ebafd5ce66220c0b20dbc7