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

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

Change-Id: I596214a6cf6efa90983ddc9f4d71fd814a63cb4c