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

Change-Id: I6cb161d23457b331aa0cb966771425b6e8de2deb