Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 666c880630" into rvc-qpr-dev-plus-aosp am: 7ef654fb30
Change-Id: I648330191bb2adf67eaab3c2fc2129aa7fc7eee8
This commit is contained in: