Merge "Add @RequiresPermission to tuner resource inquery APIs"