Merge "Check shortcut enabled before auto trun on OHM" into sc-dev am: e606dcbe am: 1606c40e

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

Change-Id: Iaf6b18be67a2de9466640a7d18f271b56453bbc8