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

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



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