Merge changes from topic "am-a1908e8956a943acbe6af7bbf814668d" into udc-dev am: 8d40d1d9 am: 379ba2ab

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



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