Merge "Correct method signature of screenshot keychord invocation" into...

Merge "Correct method signature of screenshot keychord invocation" into tm-qpr-dev am: b16641d1 am: 6deecf7a am: ccb13fa1 am: 1f01206c

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



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