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

Change-Id: I5e996bcf3f3076963128a52868cea3137462b13b