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

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



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