[automerger skipped] API: Separates getting roaming according to overridden or...

[automerger skipped] API: Separates getting roaming according to overridden or non-overridden am: 15c9f49f -s ours

am skip reason: Merged-In I025b64145caa772b27c410ae5836224f2e922fa1 with SHA-1 39117387 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22278686



Change-Id: I4c9c03ca20e1e333beab4a472b3c066947c6e5c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>