Merge "Annotation-driven content resolver and intent permission checks" into studio-1.4-dev
automerge: b9b58db

* commit 'b9b58db7842df0c1cb3534ab581404dd56bc45d6':
  Annotation-driven content resolver and intent permission checks