Merge "Allow SUPL to use restricted network in emergency" into tm-dev am:...

Merge "Allow SUPL to use restricted network in emergency" into tm-dev am: b48dca76 am: 95baa0c8 am: 5555a241 am: c7f10949

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



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