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