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

Change-Id: I7a16b133a809ad173e158d286719130f127e5854