Merge changes from topic "am-9fe6d585c59b417b8e8bc508f2bb8cf7" into...

Merge changes from topic "am-9fe6d585c59b417b8e8bc508f2bb8cf7" into udc-qpr-dev-plus-aosp am: 16c4f90c

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



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