Merge "Enable SETTINGS_DO_NOT_RESTORE_PRESERVED by default" into rvc-dev am: 3a0df8a0 am: 3a4aac9b Change-Id: Ie6bcee8648ae8e4f52b529bc513d946e456be18e