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

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



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