Merge "Check shortcut enabled before auto trun on OHM" into sc-dev am: e606dcbecb am: 950858bb30 am: 3ccf76c36a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102775 Change-Id: I192b1104451181af0549e9502f7f09855d53ef37
This commit is contained in: