[automerger skipped] Merge "API: Separates getting roaming according to overridden or non-overridden" am: 32abb2ffd8 am: b2782d734b -s ours
am skip reason: Merged-In I025b64145caa772b27c410ae5836224f2e922fa1 with SHA-1 15c9f49f9c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2508115
Change-Id: I59631115e15a20f06d37fd998d32c5def8d4bd5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: