Merge "Adding permissions to Unbundled IntentResolver." into udc-dev