Merge "Allow media keys from external keyboard to wake the device" into udc-dev am: 610ef28a

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



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