Merge "Change id type to string and extract control enum" into udc-dev am: ea854aec00 am: 72582bae35
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22959086 Change-Id: Iec5a5640c8f6b9c3e29249eb87f9975f81267538 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: