Merge changes from topic "am-9dc80b958eb34a328b175e657ba14778" into...

Merge changes from topic "am-9dc80b958eb34a328b175e657ba14778" into udc-qpr-dev-plus-aosp am: f5edfeb8

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



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