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

Change-Id: I0735bdbc1d13daeba9db40685ab9ca497777f535