Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2268e82234 am: cd03eb9dc8

Change-Id: Ic40786dc2a4d3870d24335e0d9c28e1c7fe8b866