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

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

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



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