Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
am: 1afdc562db
Change-Id: Ic014fedafca2e2f491d2a26a3e2c710a27c241e3
This commit is contained in:
05cb60b258
am: 403c8aa4ee
am: 1afdc562db
Change-Id: Ic014fedafca2e2f491d2a26a3e2c710a27c241e3