[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 83cf9c312f -s ours
am: 5e3efc46e3

Change-Id: I6f65da5f44b2397fcaa55968bbdeeb7d30c3a131