Merge "Merge "Update char limit" into udc-dev am: 5af33c00 am: da790ad8"...

Merge "Merge "Update char limit" into udc-dev am: 5af33c00 am: da790ad8" into udc-d1-dev-plus-aosp am: d1a3f6b9

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



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