[automerger skipped] Merge "Move Settings/SystemUI permissions to separate files" am: 85da5b16ea am: 4a868dcb86
am:6aa0efcf93-s ours am skip reason: change_id I91b30561d4a4000334ffbf3b98bb632d962f4b97 with SHA1c32be24d36is in history Change-Id: Ifd0e43bbd17b05d85174628fedfea12218338dae
This commit is contained in: