Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961
am: c1eb5bf440
am: 44dbfa783b
Change-Id: If857ab3d0bd64dcf53d1488c1a29a0f3d2b1145f
This commit is contained in:
5bc8aa7961
am: c1eb5bf440
am: 44dbfa783b
Change-Id: If857ab3d0bd64dcf53d1488c1a29a0f3d2b1145f