Merge changes from topic "code_sync_from_aosp" into rvc-dev

* changes:
  Change naming to be more specific
  Update preferred payment related APIs