Merge "Fix screenshot back key recognition" into tm-qpr-dev am: 6dc9f563

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



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