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

Change-Id: I9e44e02c6a19c089e0ed9f2932198ac6530115e3