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

Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d