Merge "Revert removal of GpsStatus APIs"