[automerger skipped] Merge Android U (ab/10368041) am: 94ac094915 -s ours am: f8dd7625a1 -s ours am: 803e2df03f -s ours am: 95937d66a3 -s ours

am skip reason: Merged-In I40f39f20268fa51c3f5c690e89f8853a5aff0566 with SHA-1 d1f37c215b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/24182667

Change-Id: Ibadc20e4cb94c07756a5daeec2cc6ecace04fcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>