Merge "Merge "Update char limit" into udc-dev am: 5af33c00 am: 44930efd am: a089d80b" into udc-qpr-dev-plus-aosp am: d8b0fd50

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



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