[automerger skipped] Merge Android U (ab/10368041) am: 24c28de54a -s ours am: cfc9cdfd3c -s ours am: 84cb91267e -s ours am: 719ebdc6f3 -s ours

am skip reason: Merged-In I15099dd950d5eb141238baefadebb12b1e03b5ec with SHA-1 84de222e9a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/aadevtools/+/24183068

Change-Id: Ie443dd43ad71ab0d38192c902c83c171c438eda5
Signed-off-by: Automerger Merge Worker <[email protected]>