Merge "Fix OHM H/W key shortcut dosn't work appropriately" into sc-qpr1-dev am: 9a57cd553b am: d7039b4222 am: aea4ec1e7f

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

Change-Id: I50981b9c8d448b070115fe6a71bdfa1ed95d5e7f