Merge "Check shortcut enabled before auto trun on OHM" into sc-dev am: e606dcbe am: 950858bb am: 3ccf76c3

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

Change-Id: I192b1104451181af0549e9502f7f09855d53ef37