am e918d2e5: Merge "Improve revoking access to content providers."

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit 'e918d2e59db0c29127a672dc744413e4390b37d3':
  Improve revoking access to content providers.