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

Change-Id: Id4f28134586207aba82a45ee75aec96f0bf4a19d