Merge "API: Separates getting roaming according to overridden or non-overridden" am: 32abb2ff

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



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