[automerger skipped] Merge changes from topic "udc-settings-subtitle" into udc-dev am: b2e70aeb am: 9c6fbe0c -s ours

am skip reason: Merged-In Iae541c050d04412018a4f37f60140454723f7aa4 with SHA-1 4b371e3d is already in history

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



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