Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2268e82234 am: dc4d550c88 am: 57fbe8f7ba

Change-Id: Ifc9cd8545b84f6953d68dd4a6179ebf328d2cb0c