Merge commit '198297b495d975cd4889f5136cd69368bd319eed' * commit '198297b495d975cd4889f5136cd69368bd319eed': Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
Merge commit '198297b495d975cd4889f5136cd69368bd319eed' * commit '198297b495d975cd4889f5136cd69368bd319eed': Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""