Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into...

Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp am: 633057a8

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



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