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

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

Change-Id: Icaa9c4c7e5d4da80de4628b68a692dcdb59da3fa