Merge changes from topic "tc_change_23031509_18" into udc-dev am: 191fd2ed

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



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