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

Change-Id: I341243303beccff8c027f544238273db4c667ed9