Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936
am: 32e7ea78b2" into rvc-d1-dev-plus-aosp am: 126bd277a0
am: 3e0cb5b6b4
Change-Id: I068d5de5835191baab95abeec907de946059cd9b
This commit is contained in: