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

Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp am: dd19b594

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



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