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

Merge changes from topic "am-e13afa5ac25a4c9f9470dd99b11304a0" into tm-qpr-dev-plus-aosp am: a14f4fa9

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



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