Merge changes from topic "am-bcd206a2510e4aa9b670b293c896637f" into...

Merge changes from topic "am-bcd206a2510e4aa9b670b293c896637f" into udc-qpr-dev-plus-aosp am: 4536c965

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



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