Merge "Merge "Add method for Settings" into rvc-dev am: 829ac140 am: 28bbd225 am: 5e7b64ed" into rvc-qpr-dev-plus-aosp