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

Change-Id: I52b73b7c85c6a1031d296b3d505d8a39631871f6