Merge "Merge "Add method for Settings" into rvc-dev am: 829ac140 am: a990428b am: e2aa501d" into rvc-qpr-dev-plus-aosp