Merge "Change id type to string and extract control enum" into udc-dev am:...

Merge "Change id type to string and extract control enum" into udc-dev am: ea854aec am: 0cfcccbd

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



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