[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: b03cd5de10 -s ours
am: bd64ebd8e9

Change-Id: I74a6e8db5e46e2d7a5222f33ab7afed5f5de8bad