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

Merge changes from topic "am-dc08aa2f3b60449980539bc484aaf29b" into tm-qpr-dev-plus-aosp am: b6d03a37

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



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