Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d' * commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d': Check for the DEVICE_POWER permission in userActivity.
Merge commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d' * commit 'f5bdeba197aba659e2dd3849a5bdfba8826c036d': Check for the DEVICE_POWER permission in userActivity.