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

Change-Id: I2f0d11636620f686f4cbd98ce1d6387fa93377c9