Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2e4d4808d0

Change-Id: If53f1495c545534811141fdda1f144772252a211