Merge "Make the Settings permission a required module" am: 480b56e3d6
am: bc79e6e6f3

Change-Id: I775d8b3a84ef2c1eccfb8d590e97ee1dcbeedf5d