Merge changes from topic "am-a1908e8956a943acbe6af7bbf814668d" into udc-dev am: 8d40d1d9 am: 416be6b6

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



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