Merge "Grant MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission to Shell" into rvc-dev am: 717f5ca8f9

Change-Id: If06e68a5268705c7a0de42018bcc2a27720f0f10