Merge changes from topic "am-160f24dc97cc45bda84cea789bea136f" into udc-dev am: a8c5086c am: 48b1313e

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



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