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