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

Change-Id: I8c85c1e51555ddc206e00b37e86f04a4dbfc80b4