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

Change-Id: Icfb843d38c7e0ed07d1f09982bffdbfaa290d1f6