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

Merge changes from topic "am-ee1e11b48ff64035aa2f6bbc85aea648" into udc-qpr-dev-plus-aosp am: 794dfb6c

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



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