Merge "Merge "Handle emergency SUPL on active SIM" into tm-d1-dev am:...

Merge "Merge "Handle emergency SUPL on active SIM" into tm-d1-dev am: 45811541 am: 9ac28f75" into tm-qpr-dev-plus-aosp am: a8f0ab27

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



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