Merge changes from topic "am-7e00ff462fc74a2594f376d43b700036" into...

Merge changes from topic "am-7e00ff462fc74a2594f376d43b700036" into udc-qpr-dev-plus-aosp am: 0c6660fb

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



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