Merge changes from topic "am-20534a1ee4a44d40bdc743a9919691fb" into udc-qpr-dev-plus-aosp am: 56b94f65

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



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