Merge "[SettingsState] fix boot loop due to corrupted database file" into rvc-dev am: 36ea45baa1 am: 6353c1a316 am: d5c01a5a5f am: 60c280b832
Change-Id: I86ab42d209590e7fadb07731307a169b09edac1e
This commit is contained in: