Merge changes from topic "am-d8624bcb55864d2ab4ee67868cce88db" into udc-dev-plus-aosp am: 0e57ee80 am: c70a1163

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



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