Merge "Handle emergency SUPL on active SIM" into tm-d1-dev am: 45811541cf am: 5e93561cb9 am: af45c48f8e

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

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