Merge changes from topic "am-e4c2eb1840e148bbaa501d3669a98b8a" into udc-qpr-dev-plus-aosp am: e18ebcd3

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



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