Merge "Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into...

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

Change-Id: If1f732b81a84868a3ac5113b36bfc596b80df151