Merge "Allow temporary locked OHM function disabled when keyguard visible" into sc-dev am: 7444a36439 am: 5dbbb387d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13621336 Change-Id: Iadf8c27e12a826d1ec9b271b994ee0696d738caa
This commit is contained in: