Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
am: 9dd0c5628b

Change-Id: Ibf712294cea1eeab1651d6f43b97e145b07d54c4