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

Change-Id: I016a77c9d29f6e837c3edc74440e3009ee02a64d