Merge changes from topic "am-815ae33323134b219271d85a3f065210" into...

Merge changes from topic "am-815ae33323134b219271d85a3f065210" into tm-qpr-dev-plus-aosp am: 66c9c698

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



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