Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev...

Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev am: dc895f24 am: 4e71709d

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



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