Merge "Merge "Enforce MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE permission" into rvc-dev am: d0effa2492 am: 2e4d4808d0" into rvc-d1-dev-plus-aosp am: 6d4a801ef4

Change-Id: I4b9b31e1a7303d3b229735a4847e3038148df199