Merge "Move Settings/SystemUI permissions to separate files"
am: 85da5b16ea

Change-Id: I25b9ccd6151ed9014d4a961f085c7df9e927aa66