[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 105542679f -s ours am: 2f8008876a
am: 0e1562408a

Change-Id: Ieda91c49c2f3ec3fde2a6b180b7c38f8bea149f0