Merge "Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa24 am: 2e4d4808" into rvc-d1-dev-plus-aosp