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

Change-Id: Ic209a3535b43490534e26a8cd7ed5cf78c51dd99