[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 0b2395413f -s ours
am: 22af416ad2

Change-Id: Ieee6fe82fe317082e53fc042eb0df1f0ef7391c0