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