Merge "Move Settings/SystemUI permissions to separate files"