[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 2fdd8348e5 -s ours
am: f4b11ccfe8

Change-Id: I2e3a38dee154c9e9d9167468e40ee4fa33c74073