Merge "Grant MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission to Shell" into rvc-dev am: 717f5ca8 am: f67aae7b Change-Id: I369d0cdd9b9f94a1b715f046bf2487e5daa79a42