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

Change-Id: I0f96f85edfe4bf6aa3a62a2267e27eb66fd5ce6d