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

Merge changes from topic "am-ae696ba5328c468b9c9843d0e4e9008f" into tm-qpr-dev-plus-aosp am: f8e6f1e5

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



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