Merge changes from topic "am-aa3beb9313d946ee82db16290a7accff"

* changes:
  [automerger skipped] Merge "API: Separates getting roaming according to overridden or non-overridden" into tm-qpr-dev-plus-aosp am: 987cb932 -s ours am: 33d19170 -s ours am: f9ab6ce4 -s ours
  [automerger skipped] API: Separates getting roaming according to overridden or non-overridden am: 15c9f49f -s ours am: 5a3136e6 -s ours am: 5cc00b27 -s ours