Merge "Enable SETTINGS_DO_NOT_RESTORE_PRESERVED by default" into rvc-dev am: 3a0df8a06c

Change-Id: I7626fc530fc625f07ecf40bf4ccc048d9534e1f9