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

Merge changes from topic "am-ec989e0a12cb493c87b304536feea15c" into udc-qpr-dev-plus-aosp am: db5c3efc

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



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