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

Change-Id: I7a21585e6fcfd871998348699f37fcc9e982a3dd