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

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