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

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



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