[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 73c51b4ab0 -s ours am: 9e46a782e6
am: 2dc724488b

Change-Id: Ic98adc9faf798e50dc55c9c1539ba0f911894694