Merge "Fix the overlay consuming KEYCODE_BACK" into sc-dev am: e68d19fb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39045a6c814a7c1038829b6fbea3c1f14a6b7375