[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: bd0809dbb4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic36fcfe44c5503ff892d068895da428a801edf5e