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

Merge changes from topic "am-cb04c5ec249e4cd2ad3728934a9b2d0c" into udc-qpr-dev-plus-aosp am: 281cce02

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



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