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