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

Change-Id: Ia849ea26cf53b7cf5c733e924c03f39f7401ef73