[automerger skipped] Merge "API: Separates getting roaming according to...

[automerger skipped] Merge "API: Separates getting roaming according to overridden or non-overridden" am: 32abb2ff am: b2782d73 -s ours am: 0e995e26 -s ours am: 2faa24d2 -s ours

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

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



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