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

Change-Id: Id84a2e138b3062133a5e0d8cc52fed25bac93a7a