Workaround to let SettingsUtils handle empty settings values.

Fixes: 132813801
Bug: 123885378
Test: manual verification
Change-Id: Ia21e1c4fc75fba5660bdd191e3bfa42c7b5fdb56
2 files changed