Merge changes from topics "naming", "pinlength" into udc-qpr-dev am: cab720e5

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



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