Merge "Allow media keys from external keyboard to wake the device" into...

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

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



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