Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2268e82234 am: cd03eb9dc8 am: 9a42afb984 am: be6444078d

Change-Id: I2fa031bcf835ad4ce0890956c1df427dc19b0ddd