Merge "[SettingsState] fix boot loop due to corrupted database file" into rvc-dev am: 36ea45baa1 am: 1e13b09edb am: 6e5dae13e7
Change-Id: I2c43ac4ad997236ccf69e88384f6f122a9d9bbf8
This commit is contained in: