am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded