Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa24 am: 2268e822 am: dc4d550c Change-Id: I4662c6b594310e254d163b95479fd1bd20b91d7b