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

Merge changes from topic "am-a108c3f328814842a9ecf1485391a3ef" into udc-qpr-dev-plus-aosp am: 1701022a

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



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