Merge changes from topic "am-06fb7c0d20254db983d20ed0cc667cb6" into udc-qpr-dev-plus-aosp am: 28fc3686

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



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