Merge "Allow SUPL to use restricted network in emergency" into tm-dev am: b48dca76 am: aef26d59 am: 42e3b634 am: f5425282

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



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