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

Change-Id: I2fad02a5d974eb5bef685a9c695eb52f52f8749a