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