am 1d3079cb: Merge "App ops: cleanup, handle root and shell, perms."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '1d3079cb8d477b50d5873e571695d938a6cb4712':
  App ops: cleanup, handle root and shell, perms.