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

Merge changes from topic "am-e51a7f72a0da4ef49fd8fec71af1f008" into udc-qpr-dev-plus-aosp am: 3836ee72

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



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