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

Change-Id: I65a378750e049de27777093b039c50b09aa544cc