[automerger skipped] Merge "Use enum class for tool type" into udc-dev am:...

[automerger skipped] Merge "Use enum class for tool type" into udc-dev am: 9890f5e4 am: afcc8393 -s ours

am skip reason: Merged-In Ia129a28593c4f7a5ae0326a1aabdd5e6d0b67b82 with SHA-1 d873b263 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22312825



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