am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly...

am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout.  We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner a

Merge commit '070433ed'

* commit '070433ed':
  Add a method to let a properly permissioned app directly