Merge "Emergency SUPL when location is disabled" into oc-dev
am: 2ffd98670f  -s ours

Change-Id: I44d903a9ce1a53faa9e1633cc8d69e322454704d