Merge "API: Separates getting roaming according to overridden or non-overridden" into tm-qpr-dev-plus-aosp