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

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



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