[automerger skipped] Merge "API: Separates getting roaming according to overridden or non-overridden" into tm-qpr-dev-plus-aosp am: 987cb93271 -s ours
am skip reason: Merged-In I025b64145caa772b27c410ae5836224f2e922fa1 with SHA-1 3911738715 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22278686
Change-Id: Iac2811f3f17cf210c4aa93b8f708ea6fc053c8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: