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

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



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