[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 48b1f0aba0 -s ours
am: b2c23770f8

Change-Id: I46575430cec3f60ac6ea0d52ed63934b84f3557e