Merge "Merge "Limit namespace length." into udc-dev am: 6db854c1" into...

Merge "Merge "Limit namespace length." into udc-dev am: 6db854c1" into udc-dev-plus-aosp am: 1c7e7c2b

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



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