Merge changes from topic "am-6c64ec0d09b142c78bff33f7e98a7114" into...

Merge changes from topic "am-6c64ec0d09b142c78bff33f7e98a7114" into tm-qpr-dev-plus-aosp am: fd28d318

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



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