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

Merge changes from topic "am-a8bd616d471949689504ebc9266e4940" into tm-qpr-dev-plus-aosp am: 19af1b42

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



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